From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 22 Oct 2008 15:47:44 +0000 (+0100)
Subject: x86, smpboot: A few code cleanups.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14054^2~48
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=8cd3e6c149495d73a4b2fbb23db478a0ed19fc06;p=xen.git

x86, smpboot: A few code cleanups.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 4fe7d5181c..73c115d44a 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -112,7 +112,7 @@ static void map_cpu_to_logical_apicid(void);
 /* State of each CPU. */
 DEFINE_PER_CPU(int, cpu_state) = { 0 };
 
-static void *stack_base[NR_CPUS] __cacheline_aligned;
+static void *stack_base[NR_CPUS];
 static DEFINE_SPINLOCK(cpu_add_remove_lock);
 
 /*
@@ -805,14 +805,6 @@ static inline int alloc_cpu_id(void)
 	return cpu;
 }
 
-static struct vcpu *prepare_idle_vcpu(unsigned int cpu)
-{
-	if (idle_vcpu[cpu])
-		return idle_vcpu[cpu];
-
-	return alloc_idle_vcpu(cpu);
-}
-
 static void *prepare_idle_stack(unsigned int cpu)
 {
 	if (!stack_base[cpu])
@@ -849,7 +841,7 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
 
 	booting_cpu = cpu;
 
-	v = prepare_idle_vcpu(cpu);
+	v = alloc_idle_vcpu(cpu);
 	BUG_ON(v == NULL);
 
 	/* start_eip had better be page-aligned! */